Skip to content

Two-Space Linting #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 6, 2019
Merged

Two-Space Linting #1817

merged 8 commits into from
Sep 6, 2019

Conversation

CodingItWrong
Copy link

Updates the JS and HBS linters to use the standard two-spaces instead of four, at @locks' request. This should make working with blueprints easier in the future.

Other changes:

  • Adds the standard lint:hbs NPM script and runs it as part of CI.
  • Disable the html-comments lint rule, as there are HTML comments present.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @carols10cents (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kzys
Copy link
Contributor

kzys commented Aug 30, 2019

Can we merge #1715 before this one? Merging this change makes merging other open pull requests harder...

@CodingItWrong
Copy link
Author

It's true; @locks as you requested the change do you have thoughts on how to make this change timing-wise?

@locks
Copy link
Contributor

locks commented Aug 30, 2019

I think it sounds good to wait for #1715 since it's a big PR. If there are other PRs affects, I'll personally update them to unblock them as necessary!

@CodingItWrong
Copy link
Author

@kzys I'm happy to update this PR after #1715 is merged 👍

@smarnach
Copy link
Contributor

Could we also get #1759 merged first? Not that that PR is particularly important, nor particularly big, but I believe that it is ready for merging, so it may save a bit of work to simply merge it.

@bors
Copy link
Contributor

bors commented Aug 30, 2019

☔ The latest upstream changes (presumably #1759) made this pull request unmergeable. Please resolve the merge conflicts.

@CodingItWrong
Copy link
Author

@bors @kzys sure, just let me know when y'all have a consensus that all the prior PRs you want merged first are merged, and I'll resolve the conflicts at that time

@sgrif
Copy link
Contributor

sgrif commented Sep 5, 2019

You can go ahead and rebase now

@CodingItWrong
Copy link
Author

@sgrif thanks for coordinating—i should be able to do so tomorrow morning if that works ok

@CodingItWrong
Copy link
Author

@sgrif alright, this PR is all rebased and ready to go

@sgrif
Copy link
Contributor

sgrif commented Sep 6, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 6, 2019

📌 Commit a5c5db8 has been approved by sgrif

@bors
Copy link
Contributor

bors commented Sep 6, 2019

⌛ Testing commit a5c5db8 with merge fd08c18...

bors added a commit that referenced this pull request Sep 6, 2019
Two-Space Linting

Updates the JS and HBS linters to use the standard two-spaces instead of four, at @locks' request. This should make working with blueprints easier in the future.

Other changes:

- Adds the standard `lint:hbs` NPM script and runs it as part of CI.
- Disable the `html-comments` lint rule, as there are HTML comments present.
@bors
Copy link
Contributor

bors commented Sep 6, 2019

☀️ Test successful - checks-travis
Approved by: sgrif
Pushing fd08c18 to master...

@bors bors merged commit a5c5db8 into rust-lang:master Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants